stuff
Update db config in grunt file
Add info for tests
Merge branch 'master' of github.com:topcoderinc/serenity-discussions-api

Conflicts:
	README.md