Merge remote-tracking branch 'origin/master' into develop
Commit pre pull from upstream master
resolved conflict
Hashed passwords for security
Amended license copy.
Basic test suite for testing login, and password hashing
fixed some indenting issues before it upsets Mr Bingham!
Amended license copy.
Merge remote-tracking branch 'origin/develop'
Resolved conflict
Implemented hashed passwords with unit tests.
Merge remote-tracking branch 'origin/develop'
Amended readme file.
Merge remote-tracking branch 'origin/develop'
Amended readme file.
Removed caching of navigation and site map.
Amended readme file.
Amended version number.
Merge remote-tracking branch 'origin/develop'
Amended form label.