First pages commit
Merged with master and resolved conflicts
Maintenance notice
Updated spreadsheet data import
removed useless comments
First pages commit
bug fixes
rebase master
Merge HEAD