Add app icon to config
Some code to test openTOC
Merge branch 'master' of https://github.com/christophergunn/propinquity-client

Conflicts:
	propinquity/config.xml