parser doesn't take 1hour to parse
Merge branch 'master' of github.com:NatPadHack/MtpHackathon2013 into parser

Conflicts:
	hackatonServer/app/controllers/utils/OSMParser.java
Merge pull request #1 from NatPadHack/parser

parser doesn't take 1hour to parse