Initialization and Spring Security
Merge origin/master