Update for conflicts
Use hbase for insertion
Merge branch 'master' of https://github.com/jsebfranck/icollect-server