aa
Merge branch 'master' of https://github.com/JangWonLee/TripWithMe

Conflicts:
	tripwithme/project.properties