Denys Vuika ab891ff5c2 Merge branch 'development' into dev-denys-440
# Conflicts:
#	.travis.yml
#	demo-shell-ng2/app/app.component.html
#	demo-shell-ng2/app/app.component.ts
#	demo-shell-ng2/package.json
#	demo-shell-ng2/systemjs.config.js
2016-07-22 09:59:44 +01:00
..
2016-07-20 12:10:52 +02:00