Merge remote-tracking branch 'upstream/master'
minor ui changes
Clicking on tree node will populate the converstion object in UI.
server side code for starred functionality
modified sample data for conversations
added api to get starred nodes
fixed javascript tree issue
server side implementation for Tags/Labels
Server side implementation for activity log
UI Improvements
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/java/com/restfiddle/sample/data/SampleDataGenerator.java
	src/main/resources/static/js/utils/tree.js
Reverting back old configuration.
Merge pull request #25 from hemant24/master

UI/JS Improvement