increased php execution time limit as well as moved 

Increased php execution time limit (for those of us with slower machines)
refactored repetitive foreach ($fields AS &$field) to separate function call --> $this->add_stream_fields($fields, $template)
changed version back 1.2.1-dev

public $version = '1.2.1-dev';
Merge pull request #305 from chusting/1.2/develop

increased php execution time, minor refactor repetitive code