added intelliJ files to gitignore
merged master
Merge branch 'master' of github.com:pebble-bike/PebbleBike-AndroidApp
Added scaffold for activity recognition tests
updated tests to fix test bug
(optional) use of a pressure sensor to get (more precise) altitude
Send altitude from pressure sensor quickly
Altitude: above sea level instead of above the WGS84 reference ellipsoid

Use Nmea to get the height of geoid above WGS84 ellipsoid

* http://stackoverflow.com/questions/9361870/android-how-to-get-accurate-altitude?rq=1
* http://aprs.gids.nl/nmea/#gga
Settings: pressure sensor & altitude correction
Use geoidHeight if we already got one
Title WGS84
Change geoidHeight => recalibrate altitude2 (pressure)
Merge pull request #13 from jay3/1.4_Pressure_Altimeter

Altimeter using pressure sensor and WGS84 altitude correction
merged
updated advanced location submodule to use dev branch
Send phone battery level to pebble
Merge pull request #14 from jay3/1.4_Battery_level

Send phone battery level to pebble
added ActivityRecognitionTests
v1.4.0-beta1
Merge pull request #15 from pebble-bike/1.4_RecognitionTesting

1.4 recognition testing