disabled websockets
Merge branch 'master' of https://github.com/macrozone/zhaw_link_list
Merge branch 'master' of https://github.com/macrozone/zhaw_link_list
Merge branch 'master' of https://github.com/macrozone/zhaw_link_list
Merge branch 'master' of https://github.com/macrozone/zhaw_link_list
Merge branch 'master' of https://github.com/macrozone/zhaw_link_list
Merge branch 'master' of https://github.com/macrozone/zhaw_link_list
Merge branch 'master' of https://github.com/macrozone/zhaw_link_list
large 4 colums
Merge branch 'master' of https://github.com/macrozone/zhaw_link_list
Merge branch 'master' of https://github.com/macrozone/zhaw_link_list
added
Merge branch 'master' of https://github.com/macrozone/zhaw_link_list
Merge branch 'master' of https://github.com/macrozone/zhaw_link_list

Conflicts:
	packages/.gitignore