Merge pull request #1 from Delanoche/master

remove generated files
Merge pull request #2 from Delanoche/master

get route directions
Merge pull request #3 from dipernaa/master

get stops
Merge branch 'master' of github.com:Delanoche/MCTS3000 into develop
display stops
Merge pull request #4 from Delanoche/develop

display stops
Merge branch 'master' of https://github.com/Delanoche/MCTS3000

Conflicts:
	src/com/connorhenke/mcts/MapActivity.java