Major development updates, site pushed live.
Merge branch 'dev'