Intents are now not created everytime an activity is started
Merge branch 'master' into dev

Conflicts:
	src/com/example/taximap/map/FilterActivity.java
	src/com/example/taximap/map/TabLayoutActivity.java