0.5.12
Merge branch 'master' of http://github.com/punkave/apostrophe-ui-2

Conflicts:
	package.json