commit maroto
Merge branch 'master' of https://github.com/felix-dumit/emprestae

Conflicts:
	CloudCode/public/assets/js/apps/requests/list/list_controller.js
	CloudCode/public/assets/js/apps/requests/list/list_view.js
	CloudCode/public/assets/js/apps/requests/list/templates/list.tpl
	CloudCode/public/assets/js/apps/requests/list/templates/list_item.tpl
Initializating grid view.
Merge branch 'master' of https://github.com/felix-dumit/emprestae

Conflicts:
	CloudCode/public/assets/css/application.css