update sha1 hash function for api key
resolve unresolved merge conflict
fix css syntax errors
update schema
fix syntax error in view
switch Time.now to Time.zone.now