pulled from origin master and merged changes onto branch. 2 click checkout not complete.
added in user and admin page authentication
Merged master and 2_click_checkout(which didn't finish 2 click checkout, but added some user authentication and admin authentication into the app.
I don't know why I'm commiting, something to do with an auto merge after pulling
Admin orders view complete. Order Items controller complete
Fixed tests to factor in required logins to access various pages.
minor cleanup, nothing important
Admin dashboard acceptance tests
Auth completely integrated & with tests