modify UI
Merge branch 'master' of https://github.com/EVRI-TEAM/Evri_Receiver-Mobile-App

Conflicts:
	www/js/controllers.js