updated about page
#110 Search By Keyword Bug
Merge remote-tracking branch 'origin/master'
Update README.md
#110 Solving Bug where comments were hidden
Merge remote-tracking branch 'origin/master'
enhanced front page explanobox
#110 Making Triplets.findByResourceId() compatible with Resource nodes which do not specify 'fromNodeId' and 'toNodeId' properties
Merge remote-tracking branch 'origin/master'
#110 Solving vote buttons bug (both active)
#110 Re-enabling map module by adding back old API code
Merge branch 'master' into passport

Conflicts:
	app.js
	data/Triplets._coffee