Merge pull request #6 from fssaez/master

sunday pull request #1
Added changes to MapActivity to better handle altitude in checkpoints:
- placeCurrentLocationOnMap method created
- getting current altitude from GPS
Changes made:
	
	-completed consult for altitude on double tap
	-added temporary lat and longitude
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	NavLog
Calculator/src/com/example/navlog/calculator/CalculationsModel.java
	NavLog Calculator/src/com/example/navlog/calculator/MapActivity.java
Merge pull request #11 from ManuelCintron/master

Pull #2