Merge branch 'master' into deployed-2014
Merge branch 'master' into deployed-2014
add celery queue for haystack