fix
Merge branch 'master' of https://github.com/pedrogusman/Manager

Conflicts:
	Manager/assets/www/js/data.js
	Manager/assets/www/templates/header/menu-header.html
	Manager/assets/www/templates/menu-category-items.html
	Manager/assets/www/templates/menu-edit-item.html
	Manager/bin/Manager.apk
	Manager/bin/resources.ap_
Merge branch 'master' of https://github.com/pedrogusman/Manager

Conflicts:
	Manager/assets/www/js/data.js
	Manager/assets/www/templates/header/menu-header.html
	Manager/assets/www/templates/menu-category-items.html
	Manager/assets/www/templates/menu-edit-item.html
	Manager/bin/Manager.apk
	Manager/bin/resources.ap_
fix