P2 update
Merge branch 'gh-pages' of https://github.com/asupdev/asup.git into
gh-pages

Conflicts:
	p2/site.xml