- some stuff
Merge branch 'master' of https://github.com/cckroets/InfoSessions

Conflicts:
	infosessions/src/main/java/com/sixbynine/infosessions/ui/InfoSessionListFragment.java