Merge branch 'master' of https://github.com/sfjordan/VirtualBH

Conflicts:
	bin/classes/com/vbh/virtualboathouse/CountdownActivity.class
	bin/classes/com/vbh/virtualboathouse/DisplayTimersActivity.class
	bin/classes/com/vbh/virtualboathouse/LaunchActivity.class
	bin/classes/com/vbh/virtualboathouse/LoginActivity$UserLoginTask.class
	bin/classes/com/vbh/virtualboathouse/LoginActivity.class
	bin/classes/com/vbh/virtualboathouse/PickDistTimeActivity.class
	bin/classes/com/vbh/virtualboathouse/R$id.class
	bin/classes/com/vbh/virtualboathouse/R$layout.class
	bin/classes/com/vbh/virtualboathouse/R$menu.class
	bin/classes/com/vbh/virtualboathouse/R$string.class
	bin/classes/com/vbh/virtualboathouse/R$style.class
	bin/classes/com/vbh/virtualboathouse/R$styleable.class
	bin/classes/com/vbh/virtualboathouse/Splashscreenactivity.class
conflicts
conflicts