Merge branch 'master' of https://github.com/Polytonic/Skyhook

Conflicts:
	addons/bootstrap-twitter
	addons/bootstrap-wysihtml5
Merge branch 'master' of https://github.com/Polytonic/Skyhook