build
Merge branch 'master' of https://github.com/jozzhart/phonegap-ionic

Conflicts:
	css/main.css
	js/app.js
build