menu adicionales
menu adicionales
Merge origin/master

Conflicts:
	js/settings/settingsMenu.js
Merge origin/master
11/21/2014 cesar