Improve templates identation
Change dependencies to 3.5.2-SNAPSHOT