a few changes...
Merge branch 'master' of https://github.com/pstaabp/conference-submission
Merge branch 'master' of https://github.com/pstaabp/conference-submission
Merge branch 'master' of https://github.com/pstaabp/conference-submission
Merge branch 'master' of https://github.com/pstaabp/conference-submission
changes to the login