all the functionality should now be running, only parsing needed

Signed-off-by: Fabian Jeschko <fabian.jeschko@students.uibk.ac.at>
small fix, renamed super

Signed-off-by: Fabian Jeschko <fabian.jeschko@students.uibk.ac.at>
Merge branch 'master' of https://github.com/philippkratzer/winf2014.git

Conflicts:
	projects/chat/client/app.js

Signed-off-by: Fabian Jeschko <fabian.jeschko@students.uibk.ac.at>
final merges, should work now

Signed-off-by: Fabian Jeschko <fabian.jeschko@students.uibk.ac.at>
all working, all great, i'm awesome

Signed-off-by: Fabian Jeschko <fabian.jeschko@students.uibk.ac.at>