Facebook atualização!
Merge branch 'master' of https://github.com:443/gprimo/start-trekking

Conflicts:
	StartTrekking/res/layout/activity_detalhe_trek.xml
	StartTrekking/res/values/strings.xml
	StartTrekking/src/com/example/starttrekking/DetalhesTrekActivity.java
	StartTrekking/src/com/example/starttrekking/StartTrekking.java