Change in order of jquery and bootstrap
Merge branch 'master' of https://github.com/poomalairaj/Suvadugal

Conflicts:
	views/layout.ejs
Updated gui of dashboard but controller for them not defined
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/account/login.ejs