Revert "quick commit 2014-07-04 14:57:04"

This reverts commit 70e97acd14dbab0c1fc35fdeb65052a05f8cf7e6.

revert to changes before implementing geolocation api