Feature/1147 static resources

# Warning
# Info
# Issues
Fixes #990
Fixes #1147
Fixes #1161