Add Tags on n3phele
Merge branch 'master' of https://github.com/n3phele/mobile-ui-enyo

Conflicts:
	n3phele-mobile-android/assets/www/app.js