Added automatic time offset
Merge branch 'master' of https://github.com/danrollason/BathRugby

Conflicts:
	app/src/main/java/com/ipl/bathrugby/FlashActivity.java
	app/src/main/res/layout/activity_flash.xml