test ::SELF->NetBeans IDE 8.0
Merge origin/master

Conflicts:
	Test/index.html