test
Merge branch 'master' of https://github.com/amineorion/Apology-Phonegap

Conflicts:
	platforms/android/assets/www/min/min.js
Merge branch 'master' of https://github.com/amineorion/Apology-Phonegap

Conflicts:
	platforms/android/assets/www/core/views/apoloinbox.client.view.html