pull
Merge branch 'master' of https://github.com/kelvinmbwilo/RSMSA

Conflicts:
	.idea/workspace.xml
	app/storage/views/c79942a144200803db17f684907b465c
	app/storage/views/d8258ea8428769c7939dd6c5e53539bc
rememberme
Merge branch 'master' of https://github.com/kelvinmbwilo/RSMSA

Conflicts:
	.idea/workspace.xml
	app/storage/views/56403002d13628a748e8c3f59c75bf7b
forgotpasswd
passwd
Merge branch 'master' of https://github.com/kelvinmbwilo/RSMSA

Conflicts:
	.idea/workspace.xml
user
Merge branch 'master' of https://github.com/kelvinmbwilo/RSMSA

Conflicts:
	.idea/workspace.xml
userand datatype
Merge branch 'master' of https://github.com/kelvinmbwilo/RSMSA

Conflicts:
	.idea/workspace.xml