server fix
WIP
WIP2
Included bower