Upstream update

16 Dec, 2013 - Merge with development
16 Dec, 2013 - buildiso: update lsb-release when needed
16 Dec, 2013 - Bugfix - fix cinnamon sed cmd in livecd script
Reference: http://git.manjaro.org/core/manjaroiso/commits/master