Merge branch 'develop' into staging
Merge branch 'develop' into staging
Merge branch 'develop' into staging
Merge branch 'develop' into staging
removed requirejs timeout
Merge branch 'develop' into staging
dist
Merge branch 'design/desktop' into staging
dist
fixes
Merge branch 'design/desktop' into staging
dist
Merge branch 'design/desktop' into staging
dist
welcome text modified
welcome text modified
modifications of the welcome text
Merge branch 'usagestats' into staging

Conflicts:
	views/desktop.ejs
dist
Merge branch 'tos_contact' into staging

Conflicts:
	views/desktop.ejs