Merge branch 'dev'
Merge branch 'dev'
Clean up comments
Merge branch 'dev'
Merge branch 'dev'
Update readme with submodule msg
Merge branch 'dev'

Conflicts:
	js/controllers.js
Update port examples