Merge branch 'master' of https://github.com/pencan/PebbleTestApp

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml