final merge

final merge of all files to master