Changed project structure
Removed bower because we are changing the source files of the ionic library
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/css/ionic.app.css