Initial state preservation, no collections
State preservation with collections
cleaned up code
fixed default settings for Scratch Pad upon initial launch

trivial changes to Scratch Pad layout
disable Scratch Pad auto layout
Add a new custom user button

Cleaned up code
Just added the button; still need to label it and do state restoration
fixed adding custom textfields, no highlighting or state restoration
Merge branch 'master' of https://github.com/dragonflyesque/HelioRoom_iOS

Conflicts:
	.DS_Store
	ScratchPadViewController.h
	ScratchPadViewController.m
	xmppTemplate/AppDelegate.m
	xmppTemplate/RootViewController.m
	xmppTemplate/en.lproj/MainStoryboard_iPad.storyboard
merged ScratchPad changes

- new user textfield
- state restoration