Renamed bundle
Merge branch 'IpadApp'

Conflicts:
	models/Click.js