"In the beginning"
Merge remote-tracking branch 'origin/master'
Frameworks, Spring, Tiles, distribution
Now, with images!