progress on refactor for demo

Conflicts:
	AWS/app/js/controllers/panelControllers.js
	AWS/app/js/services/services.js
merging franck's code