App 1.1

Added stuff.
Merge remote-tracking branch 'origin/master' into develop