* Criação de POIs
* Alteração na lista de paradas para apresentação de POIs
* Add Icones de Pontos de Interesse
Merge remote-tracking branch 'origin/master'

Conflicts:
	Launcher11/.idea/libraries/support_v4_19_1_0.xml
	Launcher11/.idea/misc.xml
	Launcher11/.idea/workspace.xml
	Launcher11/app/build/generated/source/r/debug/com/android/Launcher1/R.java
	Launcher11/app/build/intermediates/incremental/mergeResources/debug/merger.xml
	Launcher11/build.gradle
	Launcher11/build/intermediates/model_data.bin
	Launcher11/gradle/wrapper/gradle-wrapper.properties
	Launcher11/local.properties