create module User
Merge branch 'master' of https://github.com/se-som/Album1

Conflicts:
	config/application.config.php
add