b
Merge branch 'master' of
https://github.com/smartcampuslab/smartcampus.bikesharing.git

Conflicts:
	BikeRovereto/res/layout/stations_main.xml
nav drawer selection, existing fragment not recreated, other design
style