Jonathan_08_08_2014_02
Merge branch 'master' of https://github.com/gelopfalcon/PocketAssets