major cleanup
Merge branch 'master' of https://github.com/hrazith/-ui-framework

Conflicts:
	_includes/buttons/primaryButtons.html