23.04.2014 work Merge in site

my first merge into internet