make main
max-complexity=10
max-complexity=10 for CrossDomain.get
Merge branch 'master' into marionette

Conflicts:
	app/static/js/main-min.js