more tab controller flexibility
Merge branch 'master' of github.com:meip/slibrary

Conflicts:
	src/main/java/ch/hsr/slibrary/AppSLibrary.java