Merge tag '20140130-1935' into develop

unit items
Merge tag 'comp' into develop

comp ui
Merge tag 'button' into develop

buttons
annotation
variants started
not fully working
seems to work
fix
Revert "fix"

This reverts commit f63988a1217624c863abf79a5de5046714d469b2.
bugfix
Va
Merge branch 'feature/variants' into develop
anot.
Merge branch 'release/20140131-1050'