Minor changes.
Merge branch 'origin-develop' into staging
added test index file
major redesign
Merge branch 'staging'