Merge origin/master

Conflicts:
	Working_With_Forms/Makefile
	Working_With_Forms/nbproject/Makefile-Debug.mk
	Working_With_Forms/nbproject/Makefile-Release.mk
	Working_With_Forms/nbproject/configurations.xml
	Working_With_Forms/nbproject/private/configurations.xml
	Working_With_Forms/nbproject/project.xml
Merge CppCMS/master

Conflicts:
	Working_With_Forms/Makefile
	Working_With_Forms/nbproject/Makefile-Debug.mk
	Working_With_Forms/nbproject/Makefile-Release.mk
	Working_With_Forms/nbproject/configurations.xml
	Working_With_Forms/nbproject/private/configurations.xml
	Working_With_Forms/nbproject/project.xml
Commit
Merge branch 'master' of https://github.com/eaguilerai/CppCMS