Merge branch 'develop' for Rock v.12
Merge branch 'develop'
add waffle.io badge
Merge pull request #24 from waffle-iron/master

waffle.io integration
Add build status
Update README.md
Merge branch 'develop'
Merge remote-tracking branch 'origin/master'
Attributes are now a one-to-one relationship instead of a list
Reset build config
Updates to Rock v14
Update references to PersonAliasId instead of PersonId
Update DotLiquid for version mismatch
Build release versions
Merge branch 'master' into develop