Time: 10m
Configured dev environment
Branched code
Time: 30m
Tested launching Scratch from Kiosk application.
Time: 0m
Re synching
Merge remote-tracking branch 'origin/AppControl'

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
	Artifacts/Kiosk.jar
	Kiosk.iml
	src/com/thepaperpilot/kiosk/Kiosk.java
Time: 5m
* Cleaned up the merger
Time: 45m
* Tweaked the UI
* Added introduction panel