Basic tagging
update rails to 3.2.11
Merge branch 'develop'