Make tomcat7 the default profile and rebase patches accordingly.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Remove CRLF end-of-line (again)
Merge pull request #111 from ellert/master

Make tomcat7 the default profile and rebase patches accordingly.