Working trail
Map trail cleanup
Merge branch 'map-trails' of /home/git/repositories/root/tripmixr
Removed index map
Merge branch 'master' of git.53peaks.com:root/tripmixr
Fixed broken maps
Removed logging statement in server
Merge branch 'service' of /home/git/repositories/root/tripmixr
Fixed the app to rotate better
Added a tabbed view
Merge branch 'master' of git.53peaks.com:root/tripmixr

Conflicts:
	android/.classpath
	android/AndroidManifest.xml
	android/gen/com/tripmixr/android/R.java
	android/res/layout/default_layout.xml
	android/src/com/tripmixr/android/DefaultActivity.java
	android/src/com/tripmixr/android/LoginActivity.java
	android/src/com/tripmixr/android/REST/LoginRestService.java
	server/app.js
	server/node_server/public/javascripts/map.js
	server/node_server/views/index.ejs
	server/node_server/views/map.ejs
	server/routes/location.js
Cleanup
Merge branch 'master' of git.53peaks.com:root/tripmixr

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.