Commit
Merge branch 'master' of https://github.com/motoi75/em_project_mobile

Conflicts:
	www/assets/js/ang_app.js
Commit
Merge branch 'master' of https://github.com/motoi75/em_project_mobile

Conflicts:
	www/assets/css/style.css
	www/assets/js/ang_app.js