quick commit 2014-05-31 16:08:35
resolving
quick commit 2014-05-31 17:20:47
merging