add mockup location
merge (unsafe) with upstream
add new trash icon, other fix
merge with upstream
add geofencing stuffs
fix coding flow, expecialy the RerultData Asynctask which should not be excute that way. Google provide all callback pattern for us ;)
create the basic notification dialog
Merge pull request #15 from TETRA2000/master

hot fix: setText(int) is for res id
change chat head icon to ic_launcher
fix confliction
Merge pull request #16 from eneim/nam_mobile_ui

Nam mobile ui
added logic to load different videos to android tv
have logic for heartbeat and watching new video for VideoViewToTV
Merge pull request #17 from phantomkirby/master

have logic for heartbeat and watching new video for VideoViewToTV
Merge branch 'master' of https://github.com/GreenRobots/JPHacks

Conflicts:
	mobile/src/main/java/im/ene/androooid/jphacks/VideoViewToTV.java
	mobile/src/main/res/values/strings.xml
changed video url again