Second step on "starred" way.
Merge branch 'master' of git@github.com:lassana/bus.git

Conflicts:
	brest-bus/src/com/github/lassana/brest_bus/fragments/BusesFragment.java
	brest-bus/src/com/github/lassana/brest_bus/fragments/StarredBusesFragment.java
	brest-bus/src/com/github/lassana/brest_bus/fragments/StarredStopFragment.java