Merge pull request #66 from ziggimon/newcifix

Fixing conflict error reported in forums.
Merge pull request #67 from ziggimon/master

Taking out README information on the road to move it to online documentation (wiki or similar)
[ros6] build for armel as well
Merge remote branch 'upstream/master'