update gitignore
Merge branch 'master' of https://github.com/hdmaker/amt-project

Conflicts:
	api-rest/build/api/index.html
	api-rest/build/api/reference/index.html
	api-rest/build/blog/index.html
	api-rest/build/howto/index.html
	api-rest/build/howto/new-api-resource/index.html
	api-rest/build/howto/new-page/index.html
	api-rest/build/howto/private-content/index.html
	api-rest/build/index.html
	api-rest/build/support/faq/index.html
	api-rest/build/support/index.html