rearranged tests
Merge remote-tracking branch '451_stable/master'
added e2e tests login (slightly) and category (slightly). modified partials to allow e2e tests to use them (ID attributes)
jasmine script - not necessary but makes webstorm recognize jasmine better
added category nav scripting to scenario
added category nav scripting to scenario
Merge remote-tracking branch '451_stable/master'
Merge branch 'master' of https://github.com/rmelanson0451/451order into rmelanson0451-master

Conflicts:
	app/partials/login.html
	app/partials/nav.html