2013-06-13: refactorings
Merge branch 'integration'

Conflicts:
	000-branch-master
Merge branch 'integration'
Merge branch 'integration'
Merge remote-tracking branch 'origin/integration'
Merge remote-tracking branch 'origin/integration'
Merge remote-tracking branch 'origin/integration'
ADD: links in readme
minor changes
del redundant infos; add links
small typo
Merge remote-tracking branch 'origin/integration' into master
Merge remote-tracking branch 'origin/master' into mjuliano
Merge remote-tracking branch 'origin/master' into mjuliano