added placeholders for workspace members
minor css changes
Added yammer's metrics support - console reporting for now
Add annotations to begin logging to console
resolved merge conflicts
Merge branch 'stmishra-master'
updated to spring-boot 1.1.3.RELEASE
Added Google Analytics Code
removed GA from app
added sample data to create 2 users
added placeholders for role and permission controllers
added role and permission type enums
added dto and controllers for role and permissions
created sample data for roles and permissions
Merge remote-tracking branch 'upstream/master'
Minor change