update 2014-09-28

just quick updates from local
Merge remote-tracking branch 'origin/master'

Conflicts:
	VibC/nbproject/private/private.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	VibC/nbproject/private/private.xml
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 473651a26108b2be3408c2035dfb404a93d30cc3.
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 8a745f217dddaac3d3a64d3d30796b928ebe878a.
Revert "update 2014-09-28"

This reverts commit 0e1c941fff2ea512cbb2c3f9d56547f14971fc39.