Simple form setup and fixed button on image upload
created controller for mandrill settings
Added controller for paypal settings
Paypal and mandrill settings now update from tenant settings
Fix merge conflict in auth_settings
Merge branch 'master' of https://github.com/cdcueva/oliwi into navigation
Merge pull request #87 from cdcueva/navigation

Nav, Setup controller for mandrill and paypal, image button