Merge pull request #297 from kaspermarkus/review3

Review3: See GPII-1046
Merge pull request #298 from kaspermarkus/review3

review3: Fixed solutions registry entry for supernova and google chrome....