20121124 optional commit
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
20121311 dropping outlet animation
Merge remote-tracking branch 'origin/master'