search view left
Merge branch 'master' into dev_prav

merged with master sat2:45pm
added panel to projects
cancan abilities added
added stroy new page
Merge branch 'dev_jk' of https://github.com/jayaganthanjk/synergy into dev_prav

merged with jk sat4pm
merged with praveen
Merge remote-tracking branch 'upstream/dev_jk' into dev_jk
Merge pull request #1 from nean/dev_jk

Dev jk
shifted new project btn
user mailer done
added partails for the form
added CRUD for tasks
improved styles
adjusted form partial
Merge pull request #2 from nean/dev_jk

Dev jk
activities and state machine done
merged with jk sat7:45pm
state macine workaround
more progress bars