Merge branch 'angular2' of https://rsanchez@git.curisit.net/gitblit/git/com...

rsanchez

2017-03-15 a6284a2da0f9a69ba4495b23e52aaba5fc5745b7

Merge branch 'angular2' of
https://rsanchez@git.curisit.net/gitblit/git/common/securis.git into
angular2

Conflicts:
	securis/src/main/webapp/src/app/app.module.ts

 securis/src/main/webapp/src/app/app.module.ts
..
..
@@ -27,6 +27,7 @@
27
27
 import { NoMenuComponent }  from './nomenu.component';
28
28
 import { FooterComponent }  from './footer.component';
29
29
 import { LicenseListComponent } from './license.list.component';
30
+import { LicenseFormComponent } from './forms/license.form.component';
30
31
 
31
32
 
32
33
 import { appRoutes, appRoutingProviders } from './app.routes';