Bug fix.
Merge branch 'master' of https://github.com/usekite/kite-desktop

Conflicts:
	meteor/collections/apps.js
	meteor/collections/images.js