making sticky
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
making map location aware
Merge pull request #293 from douginator2000/agut

Agut