Merge remote-tracking branch 'origin/master'
Merge branch 'temp'
Merge branch 'master' of https://github.com/irs1318dev/irs1318_2014