merge
Merge branch 'gh-pages' of https://github.com/rdbrdd/angular into gh-pages

Conflicts:
	config.codekit