Merge branch 'master' into develop

Conflicts:
	library/src/com/withbuddies/core/modules/store/api/StoreHelper.java
Add support for removing a header