Develop webapp

Merging in the database changes and the webapp changes from develop-webapp. This will probably break some things related to the user vs. users. Also the database table is x_user_role_user but the class is x_user_role, should probably change the class name?