no message
Merge branch 'master' of https://github.com/Portalen/Portalen

Conflicts:
	Portalen.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/Portalen/Portalen

Conflicts:
	Portalen.xcodeproj/project.xcworkspace/xcshareddata/Portalen.xccheckout