locations adde to migration, new transparency and primary fields
updated migration file
resolved merge conflict (no schema.rb?)
fixed route issue
Merge pull request #19 from mule-deer-2013/locations2

Added locations primary field and transparency