Basic part
Merge branch 'master' of https://github.com/xblaster/angular-retourxp-presentation