comments added
merge complete
fixes after merge: versions upgraded, bower components moved, ...