cycle-nav
juan's revisions
Merge branch 'master' into pr/1

Conflicts:
	res/layout-port/activity_arrow_navigation.xml
	src/com/hci/cyclenav/ArrowNavigation.java