ISSUE-72 - function email_collect_extra_info, closing table tag in wrong place
CHANGE-564 - docs
CHANGE-311 - Data sanity check in customer login
CHANGE-311 - Data sanity check in customer login — check for null when incrementing counter
CHANGE-564 - docs
CHANGE-673 - Remove obsolete ssl-unclean-shutdown hack from admin
CHANGE-564 - docs
CHANGE-89 - Convert to SHA1 or better for password hashing

The actual changes go further than the initial JIRA issue description.

The intent of the change is :-

For PHP version 5.5.0 or greater - use new inbuilt password_hash functionality.
For PHP version < 5.5.0 but greater/equal to 5.3.7 - use password_hash compatibility layer https://github.com/ircmaxell/password_compat
For PHP version <5.3.7 (due to bug in crypt function) use our own custom compatibility layer using SHA256 and bigger salts

Regardless of the comapatibilty layer used the code also :-

increases the size of database fields used to store password hashes to accomodate new longer hashes/salts and to also allow for future changes to password hashing mechanisms.
updates the stored password hash whenever a succesful login occurs (admin/catalog) where necessary.
updates the stored password hash whenever a password change request is made (admin/catalog)

Note: it is not possible to update password hashes for historical passwwords stored for admin, as we do not know the corresponding plaintext password.

Also added some unit tests and amended the loading structure for unit tests (now using xml config rather than deprecated suite based loading)

We have tried to test this as extensively as possible using VM's for different PHP versions. However given the nature of the changes we still feel some more real world testing is required.

VM's tested on Ubuntu 11.10(php 5.3.6) Ubuntu 12.10(php 5.4.6) Ubuntu 13.10 (php 5.5.3)
Have not tested any windows versions :(

	new file:   includes/classes/vendors/password_compat-master/test/Unit/PasswordGetInfoTest.php

Conflicts:
	not_for_release/testFramework/unittests/testTestCase.php
Tidy up bad merge from 1.6
Docs
CHANGE-683 - Backport compatibility fix: Modify order-class notifier prior to customer email
CHANGE-685 - Fix stock reduction problem with checkbox/attribute combinations in cart
ISSUE-51 - Add ability to autoload observer classes without needing to also create auto_loaders scripts
ISSUE-19 - Fix coupon-admin date check since mktime() doesn't support is_dst param anymore
ISSUE-9 - Fix minor issue with model number display on product_reviews page
Docs
renove echo.
CHANGE-446 - Cleanup: Remove duplicate code in update_product.php
ISSUE-71 - Use debug_backtrace() to determine query_factory caller on error
CHANGE-352 - Attributes controller fatal error after upgrade