nix neues
Merge branch 'master' of https://github.com/Art-of-Muscles/AoM-App

Conflicts:
	platforms/ios/www/content/about.html