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

Conflicts:
	res/layout/show_stop_lines_map.xml