ajout plateforme android
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/index.html
	www/js/controller/timerCtrl.js
	www/partials/timer.html