Adjusted file structure to work with apache passenger
merged
Made more changes to Beta Design Document
Added changes to login
Merge conflicts