[Update] paperclip config update
Rails.configuration.image_content_type is added in the config file

it is a regular expression string of the image type
[New] Log4r is installed and ready to use
Please call bundle install beofore using log4r

Resources will be initialized inside /config/application.rb and
 /config/initializers/log4r_patch_for_rails4.rb
Merge branch 'develop-local-trial' into develop

Conflicts:
	Gemfile.lock
	config/initializers/paperclip.rb

New logger (log4r) is introduced to the server
 Please bundle install after pulling the files