Merge commit.
Merge branch 'development' of http://github.com/open-integer/integer into development
Done with service element association.