Popup window functional
Merge branch 'master', remote-tracking branch 'origin' into Indigo
Minor path repairs for presentation
Merge remote-tracking branch 'origin/master' into Indigo

Conflicts:
	public/application.js
Merge pull request #12 from danielleadams/Indigo

Indigo