some minor fixes
Merge branch 'master' of github.com:pmoorman/solliceo
login and signup forms
fix merge conflict