conflicts
new drawables
Merge branch 'master' of https://github.com/gustarim/tpg_crowd_app.git

Conflicts:
	src/ch/unige/tpgcrowd/ui/fragments/ShowLinesMapFragment.java