Merge remote-tracking branch 'remotes/origin/devel' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/devel' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/devel' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/devel' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/devel' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/devel' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/devel' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/devel' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/devel' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/devel' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/devel' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/devel' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/devel' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/devel' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/devel' into gh-pages

Conflicts:
	index.html
today's work
Merge remote-tracking branch 'remotes/origin/devel' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/devel' into gh-pages

Conflicts:
	index.html
Merge pull request #1 from picacure/gh-pages

Merge