Merge branch 'master' of /Users/Willemijn/Development/school/Pluk with conflicts.
Added menu sidebar, only the view links are not working yet