merge prep
Merge remote-tracking branch 'origin/master' into Accounts

Conflicts:
	iFinder/Default.aspx.cs
Added user account pages and forgot password
small changes. should probably find some layouts