Merge origin/master

Conflicts:
	AerialAssist/nbproject/project.xml
Merge origin/master

Conflicts:
	AerialAssist/nbproject/project.xml