MaxMana
Merge branch 'master' of https://github.com/codeca/splendens

Conflicts:
	splendens/splendens/Base.lproj/Main.storyboard
	splendens/splendens/BottomPainel.m