testing photos upload
tested drop new Drop
Merge branch 'master' of github.com:NatPadHack/MtpHackathon2013 into parser

Conflicts:
	hackatonServer/app/controllers/utils/OSMParser.java