Merge branch 'master2'
Version 2.1 Update

Major Changes:
— main.css -> base.css
— Cleaned up Front Page
— Cleaned up lots of css
— Fixed up index
— added ACF pro 5
— added HTML page template and appropriate Hooks, to allow users to
port their old html sites with copy and paste and a few replace-values.
Merge branch 'master' of https://github.com/evanfuture/townscape