Forgot Password changes all should work fine but needs testing still a bit.
Merge pull request #1 from lilfade/butterflyknife-dev

forgot password stuff
fixed mistakes in my local code (commited chrome.php and forgot to comment it out before commit)
Merge pull request #2 from lilfade/butterflyknife-dev

fixed errors on my part from dev env
remove random .xml files
Merge pull request #3 from lilfade/butterflyknife-dev

remove random .xml files
Fixed a few things
Merge branch 'pr/53' into butterflyknife