Archiving Current and old (2012) client
Merge branch 'master' of https://github.com/andrewhaw/digitaltapestry-web

Conflicts:
	.DS_Store