Merge branch 'master' into gh-pages
added beta project
added proxy to beta
Merge branch 'gh-pages'

Conflicts:
	beta/.DS_Store