Merge pull request #1921 from dumganhar/master

Adding CrystalCraze to vs2012 solution.
Updating Android Template.