worked on ajax content loader
Merge origin/master