myroutes,and details
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/bussi/developers/team/activities/ScreenLoginOficial.java
	app/src/main/res/values/strings.xml
myroutes,and details