pristine ionic 222a0d8ecab2440f3899d30c52085d57f4b6b704
Merge branch 'ionic-pristine'

Conflicts:
	app/scripts/angular-3rdparty/ionic-angular.js
needs fixes for latest ionic