SDPIII-55, updated admin side view
Merge branch 'master' into root_cause
Merge pull request #12 from StrataLabs/root_cause

Root cause admin side view changes
SDPIII-89 fixed new state update bug in activity model
Merge branch 'master' into display_rank

Conflicts:
	app/models/activity.rb