Merging Develop -> Master

Pulling in db changes, start of admin and session, config file, and removal of a large chunk of css.