mewap answers -> controller working
Merge branch 'master' of github.com:raksooo/meWap

Conflicts:
	src/main/webapp/mewap/app/js/controllers.js