manual merging #498
removing empty EN doc pages
minor fixes on en docs
updating webdriver and adding hamcrest dep.
fixing ResultSerializationTest
fixing RoutesTest
using String format instead of StringBuilder
avoiding NFE when messageParameters is empty
Merge pull request #501 from caelum/fixingAcceptanceTests

Fixing jungle acceptance tests
adding unit test case
removing non existing links
returning the empty EN doc pages

This reverts commit f7406b47224887a59738061f031c1791210cc166.
Merge pull request #505 from caelum/issue503

avoiding NFE when messageParameters is empty. Closes #503
adding preffix user. on .properties
fixing fmt:messages
adding a br on error messages
grunt task to use EN/index as home page
Merge pull request #506 from caelum/fixingMessagesOnJungle

fixing messages on jungle
Merge pull request #507 from caelum/issue336

grunt task to use EN/index as home page. Closes #336
Using relative CSS paths with usemin