add margin test
shawn version pasted
Merge remote-tracking branch 'origin/layout'

Conflicts:
	golfswingapproach/src/com/zikto/golfswingapproach/MainActivity.java
	golfswingapproach/src/com/zikto/invensense/utils/PacketParser.java