Merge branch 'Development'

Conflicts:
style.css