Merge branch 'Christian'
Merge branch 'Christian' into Tim
Had to remove some comments from the merges
Added in logic to only have the map load once, instead of everytime you click the map page tab
Started to tweak the ui more. Need to adjust the css for the slide out menu
Got the ui looking and functioning much more smoothly
Fixed the height and width percentages not working
Merge branch 'master' into Christian
Added home page along with form. login works so far, the registration form is broken though
Fixed the form page and users are entered into the database
Still working on the database creation for new users, but very close
Ran into a few problems with the import/export functions. Also added in the export button if that wasnt obvious
Got the database stuff to work when parsing out the files. Now working on the logout button and the jquery select menu
Started messing with a new menu. It works it just needs to be tweaked
Fixed the new menu and now logout works, I just need to make it so the user cant click back and be logged in still
The back button functionality still doesnt work. Put all the data in a table and formating it now. Also fixed bug in export button
Still working on the table formating. Might need to think about adding a button to add the uploaded file to the users db, instead of autmatically doing it
Finally got the css right for the table and now it looks pretty
Merge branch 'Tim' into Christian
Merge branch 'Test' into Christian