Fix merge
Merge branch 'poaDev' of https://github.com/n3phele/mobile-ui-enyo into poaDev

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