initial load
Merge branch 'master' of https://github.com/ErikHommel/org.civicoop.civicon2013

test