Signed-off-by: jobpassion <jobpassion@gmail.com>
Merge branch 'master' of https://github.com/jobpassion/webapp

Conflicts:
	src/main/resources/application.properties

Signed-off-by: jobpassion <jobpassion@gmail.com>