Merging develop into master

Cocoapods is having some problems with using pods as dependencies if they are on another branch than master. Thus we merge our develop branch into master.