UI features
Merge branch 'master' of https://github.com/haxiomic/Hive

Conflicts:
	Hive.xcodeproj/project.pbxproj