Henry Oswald 39173fe583 Merge branch 'i18n' ...

Conflicts:
	app/coffee/infrastructure/Server.coffee
	app/views/project/list.jade
	package.json

2014-07-29 13:44:10 +01:00

..

web

Merge branch 'i18n'

2014-07-29 13:44:10 +01:00