Added Android support.
Merge branch 'master' of https://github.com/php-tr/fil-ios

Conflicts:
	philip.pro.user