Merge with research semester 2013 - 204 / internship

Merge them codes