fix duplicate auth_token in development database images
added email whitelist SiteSetting feature to replicate email blacklist. email_validator method now also uses the regex method for both the whitelist and blacklist.
Fix a typo and add a step to DEVELOPER-ADVANCED.md
[fixes #391] exception when wrong resource type in URL
Merge pull request #559 from ZogStriP/fix-exception-when-wrong-resource-type-in-url

[fixes #391] exception when wrong resource type in URL
Merge pull request #532 from kubabrecka/fix_duplicate_tokens

fix duplicate auth_token in development database images
Merge pull request #492 from sbauch/email-whitelist

added email whitelist SiteSetting feature to replicate email blacklist S...
Convert a lot of :a => b to a: b and bring peace to the world
Merge pull request #547 from kid0m4n/convert-ruby-1-9-syntax

Convert a lot of :a => b to a: b and bring peace to the world