fixed tests.
move local auth tests to different file.
change indentation of routes.js
change indentation of routes.js
Merge branch 'master' into dev

Conflicts:
	test/Routes.js
indentation fix.
disbled local route tests for now.