Merge pull request #5 from desouradeep/dev

Registration form fixed and some minor UI fixes
Merge pull request #6 from desouradeep/dev

Changes in urls
Merge remote-tracking branch 'upstream/master' into dev