UserService changes and upgrade of bootstrap
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/pwr/suspy/service/UserService.java