Merge pull request #18 from mule-deer-2013/view

View
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
fixed search page issues
Merge pull request #20 from mule-deer-2013/fixes

fixed search page issues
added sticky footer and fixed translation
pull from origin master
pull from origin
make footer lay at the bottom on any content size
WIP: working on search result page
result page now have content and search-sum bar
WIP: styling search result page