Initial commit
Merge branch 'develop'
Merge branch 'develop'
Added port to the 'basepath' URL to allow for non-standard ports like MAMP's 8888.
Merge branch 'master' into develop