Merge pull request #21 from ibalejandro/master

New version after refactoring it.
The current uploading contains the functionality of adding user markers. Now, the user can create his own markers and save them in the server. When the user logs in, his personal markers appear also on the screen.