Merge remote-tracking branch 'origin/master' into stable
Fixes for friendly URLs
Merge remote-tracking branch 'origin/master' into stable
Merge remote-tracking branch 'origin/master' into stable
Merge remote-tracking branch 'origin/master' into stable
Merge remote-tracking branch 'origin/master' into stable
Merge remote-tracking branch 'origin/master' into stable
Merge remote-tracking branch 'origin/master' into stable
Merge remote-tracking branch 'origin/master' into stable

Conflicts:
	website/.htaccess
Merge remote-tracking branch 'origin/master' into stable
Merge remote-tracking branch 'origin/master' into stable
Adding link to Google+ profile for SEO
Updating Website to add terms of use & privacy policy ( required for App Store submission )
Adding missing root slashes
Merge remote-tracking branch 'origin/stable'