Merge tag 'deploy-2013-05-10'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Got Parties tab working (#31)