Merge branch 'bootstrap' of https://github.com/laDanz/BuLiTipp into bootstrap

Conflicts:
	BuLiTipp/BuLiTipp.pyproj
Merge branch 'bootstrap' of https://github.com/laDanz/BuLiTipp into bootstrap