Merge pull request #26 from unepwcmc/master

Downloads Fix
upgrade to rails 3.2.13

Conflicts:

	Gemfile.lock
set production deployment to production branch
Merge branch 'production' of github.com:unepwcmc/SAPI into production
merged migrations
Revert "merged migrations"

This reverts commit 1422903f9db9f330b800143b14b6dd436698611c.
sanitize query before running auto complete sql
fixed issue with geo entities caching
fix for EU listings getting mixed with CITES listings in history file
fix for hiding hybrids in cites checklist
Update README.rdoc
Update README.rdoc
Import trade codes before cites quotas and suspensions
cleaned up the generated superscript annotations key
fix for exception when not passing parameters to CitesSuspension export
Merge branch 'master' of github.com:unepwcmc/SAPI
stubbed pandoc methods
removed duplication in downloads controller
added newpage before latex part
removed hanging indents from annotations key