Update to including new format
Merge branch 'master' of https://github.com/AdsOptimal/adsoptimal-wordpress-plugin

Conflicts:
	admin/assets/iphone_5_black.png