Merge branch 'master' of github.com:reneras/ngeurope14
Merge branch 'master' of github.com:reneras/ngeurope14