Merge branch 'master' of github.com:neo4j/neo4j-browser

Conflicts:
	app/scripts/init/frameInterpreters.coffee