js changes
Merge branch 'master' of https://github.com/carney071/codeNameWEAR

Conflicts:
	Resources/iphone/alloy/controllers/index.js