Update Version no to 1.2 in master branch.

Signed-off-by: Kristian Duske <kristian.duske@gmail.com>
Merge branch 'refs/heads/Release_1.1.0'

Signed-off-by: Kristian Duske <kristian.duske@gmail.com>

Conflicts:
	Source/Version
Download URL inncorrect

changed http://kristianduske.com/trenchbroom/download.php to http://kristianduske.com/trenchbroom/downloads.php
Merge pull request #708 from Joban66/patch-1

Download URL inncorrect
Fix assertion failure when editing a light entity which has _color values specified as integers 0-255
Merge pull request #813 from ericwa/color-editor-crash-fix

Fix assertion failure when editing a light w/ _color value in the 0-255 format
Fix an uninitialized read of m_forceIntegerFacePoints reported by valgrind:

==32250== Conditional jump or move depends on uninitialised value(s)
==32250==    at 0x54B631: TrenchBroom::Model::FindFacePoints::instance(bool) (Face.cpp:34)
==32250==    by 0x54E1A3: TrenchBroom::Model::Face::updatePointsFromBoundary() (Face.cpp:488)
==32250==    by 0x54D31C: TrenchBroom::Model::Face::Face(TrenchBroom::VecMath::BBox<float> const&, bool, TrenchBroom::VecMath::Vec<float, 3ul> const&, TrenchBroom::VecMath::Vec<float, 3ul> const&, TrenchBroom::VecMath::Vec<float, 3ul> const&, std::string const&) (Face.cpp:361)
==32250==    by 0x4E2E6F: TrenchBroom::IO::MapParser::parseFace(TrenchBroom::VecMath::BBox<float> const&, bool) (MapParser.cpp:339)
==32250==    by 0x4E1C5F: TrenchBroom::IO::MapParser::parseBrush(TrenchBroom::VecMath::BBox<float> const&, bool, TrenchBroom::Utility::ProgressIndicator*) (MapParser.cpp:244)
==32250==    by 0x4E1606: TrenchBroom::IO::MapParser::parseEntity(TrenchBroom::VecMath::BBox<float> const&, TrenchBroom::IO::MapParser::FacePointFormat&, TrenchBroom::Utility::ProgressIndicator*) (MapParser.cpp:165)
==32250==    by 0x4E1A55: TrenchBroom::IO::MapParser::parseMap(TrenchBroom::Model::Map&, TrenchBroom::Utility::ProgressIndicator*) (MapParser.cpp:213)
==32250==    by 0x55731D: TrenchBroom::Model::MapDocument::loadMap(char*, char*, TrenchBroom::Utility::ProgressIndicator&) (MapDocument.cpp:136)
==32250==    by 0x556AE9: TrenchBroom::Model::MapDocument::DoOpenDocument(wxString const&) (MapDocument.cpp:79)
==32250==    by 0x727FBF: wxDocument::OnOpenDocument(wxString const&) (docview.cpp:417)
==32250==    by 0x55A325: TrenchBroom::Model::MapDocument::OnOpenDocument(wxString const&) (MapDocument.cpp:668)
==32250==    by 0x72C861: wxDocManager::CreateDocument(wxString const&, long) (docview.cpp:1522)
Merge pull request #930 from ericwa/uninitialized-read-fix

TB1: Fix an uninitialized read of m_forceIntegerFacePoints reported by valgrind
Merge branch 'master' into Release_1.1.0
Correct version no.