Updates
Merge branch 'master' of https://github.com/dominicschaff/LiftOff

Conflicts:
	.idea/libraries/support_v4_21_0_0.xml
Merge branch 'master' of https://github.com/dominicschaff/LiftOff