added angular elements
Merge branch 'master' of https://github.com/Nearei/EventBox
fix merge
user loading stuff