Added merge account button to the account settings page.

Signed-off-by: Tyler O'Meara <Tyler@TylerOMeara.com>
Added server side check for same account merges, and fixed some formatting.

Signed-off-by: Tyler O'Meara <Tyler@TylerOMeara.com>
Added ability to work with non-migrated databases.

Signed-off-by: Tyler O'Meara <Tyler@TylerOMeara.com>
Fixed more style problems.

Signed-off-by: Tyler O'Meara <Tyler@TylerOMeara.com>
Make the results of the merge process more clear to the end user.

Signed-off-by: Tyler O'Meara <Tyler@TylerOMeara.com>
Merge pull request #136 from Acidity/feature/mergeAccounts

Added merge account button to the account settings page.