conflict doh !
Merge branch 'master' of https://github.com/horzadome/meip

Conflicts:
	mobile-app/index.php