merge changes for storm-1060

.hgignore

BuildParams

doc/contributions.txt

indra/newview/CMakeLists.txt

indra/newview/icons/beta/secondlife.icns

indra/newview/icons/beta/secondlife.ico

indra/newview/icons/beta/secondlife_128.png

indra/newview/icons/beta/secondlife_16.png

indra/newview/icons/beta/secondlife_256.BMP

indra/newview/icons/beta/secondlife_256.png

indra/newview/icons/beta/secondlife_32.png

indra/newview/icons/beta/secondlife_48.png

indra/newview/icons/beta/secondlife_512.png

indra/newview/icons/development/secondlife.icns

indra/newview/icons/development/secondlife.ico

indra/newview/icons/development/secondlife_128.png

indra/newview/icons/development/secondlife_16.png

indra/newview/icons/development/secondlife_256.BMP

indra/newview/icons/development/secondlife_256.png

indra/newview/icons/development/secondlife_32.png