Added tiered solar panels.
solar v1 (the normal one) generates 111 power (nerfed back from my previous upgrade). Available in reinforced version  (111 power)
solar v2 generates 222 power. Available in reinforced version (200) both as a rare recipe found in the robots for fun and profit book.
solar v3, the quantum solar panel. Found in the item lab ends.

Solar panels drop solar cells when they are damaged by Z's in the ame.

Fixed some of the badly placed items in the item lab ends.
Reduced solar cell weight by half. only half a kg now. So solar panels are not likely to dissasemble into more weight.
Updated description.
Updated description again.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into Solar_Tiers

Conflicts:
	src/mapgen.cpp
Updated weights and volumes.
Nerfed the reinforced solar panel (was 111, is now 100, all that metal and glass gets in the way). Reduced the smashing loot drops a bit.
Reduced reinforcement penalty from 11% to 6%
Updated description.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into Solar_Tiers

Conflicts:
	data/json/items/vehicle_parts.json
Makes otaku profession cost one point.

Four points? Really? For a tiny backpack and a sewing kit that they
don't even have the skill to use? Or is it the cheeseburger and cat ears
that make it so crazy expensive?

Seriously.
Clown cost change -1

The clown does not start with any skills or items, it fits better with -1 to points.
moved the tool consumption before the actual installation of the vehicle part.

This prevents the new part from being used as tool during the installation.
More -1 profession balancing. 

-1 bride/groom, hitchhiker, and lost submissive. No reason to take these over a 0 point profession, the have no beneficial items or traits.
Merge pull request #6230 from Rivet-the-Zombie/otaku-price-fix

Makes otaku profession cost one point.
Merge branch 'fix-another-thing' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-fix-another-thing
Merge branch 'Solar_Tiers' of https://github.com/Soyweiser/Cataclysm-DDA into Soyweiser-Solar_Tiers
Merge pull request #6231 from nieenden/patch-1

Clown cost change -1
Merge pull request #6233 from nieenden/patch-2

More -1 profession balancing.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Puts throwing weapons in the 'weapons' category.

They're not ammunition, but that's what the game currently calls them.