Merge branch 'Christian' into Test
Merge branch 'Test' into Christian
Added the ability to add kml files onto the map. Fixed the table issue. Another issue now is the way im loading the points because if there are multiple users then the database is going to be deleted alot and users are going to step on each others toes
I had to push it
Merge branch 'master' into Christian
Added in the ability to read in excel files. Also switch from using the grails database to using the manually generated one for each user, in order to keep all points and files seperate
Overwriting Tim 8-26-14
Merge branch 'Christian' into Tim