Merge static-pages to develop
Completed merge of static-pages, user stuff and develop
Bug