using now imageFile instead of imageURL
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/js/PinsterApp.js
Merge branch 'master' of https://github.com/saharrehani/Pinster