Hello last commit

Squashed commit of the following:

commit aa6b3ed37b0f03ca26e2ec4af7293809461d40c3
Author: mlazic <ml DOT tenen AT gmail DOT com>
Date:   Fri Feb 8 21:25:13 2013 +0100

    reseni koflikt
    Conflicts:
    	TestProject/app/controllers/Application.java

commit 5d35df09d9e80bf0c7227f576c44dc9b62b56820
Author: mlazic <ml DOT tenen AT gmail DOT com>
Date:   Fri Feb 8 21:00:44 2013 +0100

    Conflicts:
    	TestProject/app/controllers/Application.java

commit 3b60cb52091848a0e16d2cd1e422fcca134f42ca
Author: mlazic <ml DOT tenen AT gmail DOT com>
Date:   Fri Feb 8 21:00:24 2013 +0100

    Conflicts:
    	TestProject/app/controllers/Application.java

commit f8152bde1b37f1f4ca0fd3d3d6ef156a6c9d7e0d
Author: mlazic <ml DOT tenen AT gmail DOT com>
Date:   Fri Feb 8 20:56:29 2013 +0100

    Added new lines on branch novagrana