Upgraded to scala 2.11.4
Added v7 support library
Upgraded support-v4 to 21
Fixed duplicate icon attr definition
Set project version to 0.1.12-BETA
Merge branch 'develop'