statIDa
Merge branch 'master' of https://github.com/fdograph/EQP

Conflicts:
	wp-content/plugins/StatIDA/index.php