Initial revision
Added comments from demo, 26th April
Claimed some tasks.
Marked some tasks done.
Various changes.
Merge branch 'master' into master-old