Mostly Complete
Small changes
Added template pages
Merge branch 'maps'
Conflicts Resolved