first commit
images
Merge https://github.com/aaronksaunders/tiConnectSampleApp

Conflicts:
	app/controllers/index.js
	app/lib/alloy/sync/customAdapter.js