Merge branch 'hotfix/2013-02.03'
Merge branch 'release/2013-04.01'
bumped version string
Merge branch 'develop' into release/2013-04.02
Merge branch 'develop' into release/2013-04.02
Merge branch 'release/2013-04.02'
bumped version string
Merge branch '2013-04.03'
bumped version string
Merge branch 'develop' into release/2013-04.04
Merge branch 'release/2013-04.04'
bumped version string
redesigned users/index
Merge branch 'release/2013-04.05'
bumped version string
Merge branch 'develop' into release/2013-04.06
Merge branch 'release/2013-04.06'
Merge branch 'master' into develop
unbumped version string
removed dead code