Ignore AEP Files
Merge branch 'Testbench' into Dev

Conflicts:
	.gitignore
Merge branch 'Dev'
Merge branch 'master' of https://github.com/SFBurning/Waypoints