Merge remote-tracking branch 'origin/master' into Branch_2014-28-02

Conflicts:
	src/main/java/com/springapp/mvc/HelloController.java