2014-03-16 22:45

 - Making it work in local
Merge branch 'local' into huks