branch with scroll view
finished first implementation of complex script editor
xcode commit
Merge branch 'UIDev' into Master

Conflicts:
	WyLightRemote/WyLightRemote.xcodeproj/xcuserdata/weitys1.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
Merge commit '340d9a868c9a3cf4dc434a027ade40c45a676a17' into Master
some fixes for the collection view
fix bug in gradient model and improve ScriptView design
some improvements of complex script view controller
- added deviceId to wlan config dialog
- read configured passphrase in wlan config dialog
small changes in complex script view controller
script view development in progress
implement script control object
added support for device name and device online status
Merge branch 'r2-android' into dev
- change textcolor to green for online remotes instead of aggressive blue background ;-)