Merge branch 'unstable' of https://github.com/neonline/amarillas into unstable

Conflicts:
	html/assets/img/amarillas_banner-home.jpg
	html/assets/img/amarillas_banner-segmentado.jpg
	html/assets/img/amarillas_ficha-empresa-estandar.jpg
	html/assets/img/amarillas_ficha-empresa-premium.jpg
	html/assets/img/amarillas_posicion-estandar.jpg
	html/assets/img/amarillas_posicion-premium.jpg
	html/assets/img/btn_cotiza.png
	html/assets/img/catalogos.jpg
	html/assets/img/ej_plantilla-web1.jpg
	html/assets/img/ej_plantilla-web2.jpg
	html/assets/img/ej_web1.jpg
	html/assets/img/ej_web2.jpg
	html/assets/img/ej_web3.jpg
	html/assets/img/ejemplos_catalogos.jpg
	html/assets/img/ejemplos_sitiosweb.jpg
	html/assets/img/ejemplos_videos.jpg
	html/assets/img/emol_posicion-estandar.jpg
	html/assets/img/emol_posicion-premium.jpg
	html/assets/img/estadisticas_amarillas.jpg
	html/assets/img/estadisticas_emol.jpg
	html/assets/img/estadisticas_mercantil.jpg
	html/assets/img/img-set_mobiles.jpg
	html/assets/img/img_amarillascom.jpg
	html/assets/img/img_contacto.gif
	html/assets/img/img_emolcom.jpg
	html/assets/img/img_mercantilcom.jpg
	html/assets/img/img_web-mobile.jpg
	html/assets/img/logo-amarillascom_web-220x70px.jpg
	html/assets/img/mercantil_banner-home.jpg
	html/assets/img/mercantil_banner-masivo.jpg
	html/assets/img/mercantil_banner-segmentado.jpg
	html/assets/img/mercantil_banner-top.jpg
	html/assets/img/mercantil_ficha-empresa.jpg
	html/assets/img/mercantil_posicion-estandar.jpg
	html/assets/img/mercantil_posicion-premium.jpg
	html/assets/img/videos.jpg
	html/views/catalogos.html
	html/views/contactanos.html
	html/views/ej_catalogos.html
	html/views/ej_sitioweb.html
	html/views/ej_videos.html
	html/views/estadisticas.html
	html/views/estandar.html
	html/views/figura_gratis.html
	html/views/mercantil_estandar.html
	html/views/mercantil_premium.html
	html/views/mercantil_publicitarios.html
	html/views/mercantil_red_portales.html
	html/views/premium.html
	html/views/publicitarios.html
	html/views/quienes_somos.html
	html/views/red_portales.html
	html/views/sitioweb.html
	html/views/videos.html
	json/usr/share/hunspell/es_CL/es_CL.aff
	json/usr/share/hunspell/es_CL/es_CL.dic
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch unstable
# Your branch and 'origin/unstable' have diverged,
# and have 2 and 5 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   html/assets/js/app.js
#	modified:   html/assets/js/controllers/profileCtrl.js
#	modified:   html/assets/js/controllers/searchCtrl.js
#	modified:   html/assets/js/functions/functions.js
#	modified:   html/assets/js/services/services.js
#	modified:   html/index.html
#	modified:   html/views/catalogos.html
#	modified:   html/views/contactanos.html
#	modified:   html/views/ej_catalogos.html
#	modified:   html/views/ej_sitioweb.html
#	modified:   html/views/ej_videos.html
#	modified:   html/views/estadisticas.html
#	modified:   html/views/estandar.html
#	modified:   html/views/figura_gratis.html
#	modified:   html/views/footer.html
#	modified:   html/views/header.html
#	modified:   html/views/home_marketing.html
#	modified:   html/views/mercantil_estandar.html
#	modified:   html/views/mercantil_premium.html
#	modified:   html/views/mercantil_publicitarios.html
#	modified:   html/views/mercantil_red_portales.html
#	modified:   html/views/premium.html
#	modified:   html/views/publicitarios.html
#	modified:   html/views/quienes_somos.html
#	modified:   html/views/red_portales.html
#	modified:   html/views/sitioweb.html
#	modified:   html/views/videos.html
#	modified:   json/mappings.js
#	deleted:    json/spanish-stopwords.txt
#	deleted:    json/synonym.txt
#	new file:   json/synonyms.txt
#