conflict resolution - akdesign with alpha index.html

Went through an manually resolved all the merge errors between master and origin/master. Attempting another pull request for akdesign into master.